amlogic: Fix prefixes in the platform macros file

Fixing at the same time the related register names.

Signed-off-by: Carlo Caione <[email protected]>
Change-Id: Ib1130d50abe6088f1c0826878d1ae454a0f23008

diff --git a/plat/amlogic/common/include/plat_macros.S b/plat/amlogic/common/include/plat_macros.S
index c721c21b68455d0626822fb4f1dbedc8d417f50a..d620fcfba60b8786a7666e7f79add27509226014 100644 (file)
--- a/plat/amlogic/common/include/plat_macros.S
+++ b/plat/amlogic/common/include/plat_macros.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -33,7 +33,7 @@ spacer:
 
        /* GICC registers */
 
-       mov_imm x17, GXBB_GICC_BASE
+       mov_imm x17, AML_GICC_BASE
 
        adr     x6, gicc_regs
        ldr     w8, [x17, #GICC_HPPIR]
@@ -43,7 +43,7 @@ spacer:
 
        /* GICD registers */
 
-       mov_imm x16, GXBB_GICD_BASE
+       mov_imm x16, AML_GICD_BASE
 
        add     x7, x16, #GICD_ISPENDR
        adr     x4, gicd_pend_reg

diff --git a/plat/amlogic/gxbb/gxbb_bl31_setup.c b/plat/amlogic/gxbb/gxbb_bl31_setup.c
index be23ce3b0b97b3417f4e04ebba0fa4b8949dc587..e5402c3395b8f2cfd8b00cf14c473b0dab12f872 100644 (file)
--- a/plat/amlogic/gxbb/gxbb_bl31_setup.c
+++ b/plat/amlogic/gxbb/gxbb_bl31_setup.c
@@ -127,8 +127,8 @@ static const interrupt_prop_t gxbb_interrupt_props[] = {
 };
 
 static const gicv2_driver_data_t gxbb_gic_data = {
-       .gicd_base = GXBB_GICD_BASE,
-       .gicc_base = GXBB_GICC_BASE,
+       .gicd_base = AML_GICD_BASE,
+       .gicc_base = AML_GICC_BASE,
        .interrupt_props = gxbb_interrupt_props,
        .interrupt_props_num = ARRAY_SIZE(gxbb_interrupt_props),
 };

diff --git a/plat/amlogic/gxbb/gxbb_def.h b/plat/amlogic/gxbb/gxbb_def.h
index e43bb1d26c81c281bf61bc4802655b4faf17431f..e888aa60685e288d2d09e3c992c909134c85c206 100644 (file)
--- a/plat/amlogic/gxbb/gxbb_def.h
+++ b/plat/amlogic/gxbb/gxbb_def.h
@@ -58,8 +58,8 @@
 /*******************************************************************************
  * GIC-400 and interrupt handling related constants
  ******************************************************************************/
-#define GXBB_GICD_BASE                         UL(0xC4301000)
-#define GXBB_GICC_BASE                         UL(0xC4302000)
+#define AML_GICD_BASE                          UL(0xC4301000)
+#define AML_GICC_BASE                          UL(0xC4302000)
 
 #define IRQ_SEC_PHY_TIMER                      29
 

diff --git a/plat/amlogic/gxl/gxl_bl31_setup.c b/plat/amlogic/gxl/gxl_bl31_setup.c
index ddf43c9e226866cdb8d3b97147933da4c7c923f5..796f1a0a80cd0258f0149f52deb649715b9ef81c 100644 (file)
--- a/plat/amlogic/gxl/gxl_bl31_setup.c
+++ b/plat/amlogic/gxl/gxl_bl31_setup.c
@@ -141,8 +141,8 @@ static const interrupt_prop_t gxbb_interrupt_props[] = {
 };
 
 static const gicv2_driver_data_t gxbb_gic_data = {
-       .gicd_base = GXBB_GICD_BASE,
-       .gicc_base = GXBB_GICC_BASE,
+       .gicd_base = AML_GICD_BASE,
+       .gicc_base = AML_GICC_BASE,
        .interrupt_props = gxbb_interrupt_props,
        .interrupt_props_num = ARRAY_SIZE(gxbb_interrupt_props),
 };

diff --git a/plat/amlogic/gxl/gxl_def.h b/plat/amlogic/gxl/gxl_def.h
index ced811d94a623c2c76957495f6f6eb07f579032f..3cc7a1c03cf7f4ba7f2f8c4ecd32652b526eb025 100644 (file)
--- a/plat/amlogic/gxl/gxl_def.h
+++ b/plat/amlogic/gxl/gxl_def.h
@@ -62,8 +62,8 @@
 /*******************************************************************************
  * GIC-400 and interrupt handling related constants
  ******************************************************************************/
-#define GXBB_GICD_BASE                         UL(0xC4301000)
-#define GXBB_GICC_BASE                         UL(0xC4302000)
+#define AML_GICD_BASE                          UL(0xC4301000)
+#define AML_GICC_BASE                          UL(0xC4302000)
 
 #define IRQ_SEC_PHY_TIMER                      29